From: Jim Blandy <jimb@redhat.com>
Date: Tue, 22 Jun 1993 08:17:36 +0000 (+0000)
Subject: * keyboard.c (menu_bar_items, read_key_sequence): Use
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95173
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7e6992e06ecebb7729c645b880ed7b55eb597ab2;p=emacs.git

* keyboard.c (menu_bar_items, read_key_sequence): Use
	current_global_map, not global_map; the latter is only meant to be
	used for initial_define_key.
	* commands.h: Doc fix.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 6a18aed16f9..4271f6c9df8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3170,7 +3170,7 @@ menu_bar_items ()
 #else
     maps[nmaps-2] = current_buffer->keymap;
 #endif
-    maps[nmaps-1] = global_map;
+    maps[nmaps-1] = current_global_map;
   }
 
   /* Look up in each map the dummy prefix key `menu-bar'.  */
@@ -3740,7 +3740,7 @@ read_key_sequence (keybuf, bufsize, prompt)
 #else
     submaps[nmaps-2] = current_buffer->keymap;
 #endif
-    submaps[nmaps-1] = global_map;
+    submaps[nmaps-1] = current_global_map;
   }
 
   /* Find an accurate initial value for first_binding.  */